From 782c2762bf55fb17402f534267c370cf460869af Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Dec 2015 07:52:18 -0500 Subject: [PATCH] gadget: Be more forgiving to size inconsistencies Instead of asserting if we hit negative content sizes, warn and continue. This is easier to work with in this transition period. --- gtk/gtkcssgadget.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcssgadget.c b/gtk/gtkcssgadget.c index de8641810d..60bb9d2a8c 100644 --- a/gtk/gtkcssgadget.c +++ b/gtk/gtkcssgadget.c @@ -451,8 +451,17 @@ gtk_css_gadget_allocate (GtkCssGadget *gadget, if (baseline >= 0) baseline += extents.top; - g_assert (content_allocation.width >= 0); - g_assert (content_allocation.height >= 0); + if (content_allocation.width < 0) + { + g_warning ("Negative content width while allocating gadget\n"); + content_allocation.width = 0; + } + + if (content_allocation.height < 0) + { + g_warning ("Negative content height while allocating gadget\n"); + content_allocation.width = 0; + } GTK_CSS_GADGET_GET_CLASS (gadget)->allocate (gadget, &content_allocation, baseline, &content_clip); -- 2.30.2